From 86cebc9b43cfad08f6d4ad5a268d26b2285394c8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 7 May 2012 17:12:36 +0200 Subject: [PATCH] iconview: Fix negative natural size request on empty iconview --- gtk/gtkiconview.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index c891509f2f..6670098924 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -1543,8 +1543,16 @@ gtk_icon_view_get_preferred_width (GtkWidget *widget, { int n_items = gtk_icon_view_get_n_items (icon_view); - *minimum = n_items ? item_min : 0; - *natural = item_nat * n_items + priv->column_spacing * (n_items - 1); + if (n_items == 0) + { + *minimum = 0; + *natural = 0; + } + else + { + *minimum = item_min; + *natural = item_nat * n_items + priv->column_spacing * (n_items - 1); + } } *minimum += 2 * priv->margin; @@ -1595,8 +1603,16 @@ gtk_icon_view_get_preferred_height (GtkWidget *widget, } else { - *minimum = n_items ? item_min : 0; - *natural = item_nat * n_items + priv->row_spacing * (n_items - 1); + if (n_items == 0) + { + *minimum = 0; + *natural = 0; + } + else + { + *minimum = item_min; + *natural = item_nat * n_items + priv->row_spacing * (n_items - 1); + } } *minimum += 2 * priv->margin; -- 2.30.2